bitkeeper revision 1.1159.210.1 (41d59b4aOWdXjAhVW7vNOk29WN5c_w)

fix build w/ trace/debug/etc enabled [from michael day]

diff --git a/xen/arch/x86/pdb-stub.c b/xen/arch/x86/pdb-stub.c
index bb145aa104aa89504ca45d3120a7b7f4ec5c03c2..827035e07f320d0897639eab80a49f55ea6d7a22 100644 (file)
--- a/xen/arch/x86/pdb-stub.c
+++ b/xen/arch/x86/pdb-stub.c
@@ -21,6 +21,7 @@
 #include <xen/list.h>
 #include <xen/serial.h>
 #include <xen/softirq.h>
+#include <xen/init.h>
 
 /* opt_pdb: Name of serial port for Xen pervasive debugger (and enable pdb) */
 static unsigned char opt_pdb[10] = "none";

diff --git a/xen/common/trace.c b/xen/common/trace.c
index 06547c67d1c24be634999c0ecb016f686fbe0313..83bf5ce55eed7449651c5ac9887bf24b24828ca6 100644 (file)
--- a/xen/common/trace.c
+++ b/xen/common/trace.c
@@ -25,6 +25,7 @@
 #include <xen/smp.h>
 #include <xen/trace.h>
 #include <xen/errno.h>
+#include <xen/init.h>
 #include <asm/atomic.h>
 #include <public/dom0_ops.h>
 

diff --git a/xen/include/asm-x86/x86_32/regs.h b/xen/include/asm-x86/x86_32/regs.h
index e03e2a8a4b55b28474e8534e32f423e265507a8c..57d21e3cb6e0cda3f5fdf033e4b601a2114c5bd5 100644 (file)
--- a/xen/include/asm-x86/x86_32/regs.h
+++ b/xen/include/asm-x86/x86_32/regs.h
@@ -1,6 +1,8 @@
 #ifndef _I386_REGS_H
 #define _I386_REGS_H
 
+#include <asm/types.h>
+
 struct xen_regs
 {
     /* All saved activations contain the following fields. */